Feature/fix values#23631
Closed
Picazsoo wants to merge 13 commits intoOpenAPITools:masterfrom
Closed
Conversation
- Add unescapedSummary, unescapedMessage, unescapedDefaultValue,
unescapedDescription fields to CodegenOperation, CodegenResponse,
CodegenParameter, CodegenProperty; populate in DefaultCodegen
- Add escapeInNormalString, escapeDollarInMultiline, escapeDollar,
removeLineBreak lambdas to AbstractKotlinCodegen/KotlinSpringServerCodegen
via addMustacheLambdas() using lambda. prefix
- Update ~50 Mustache templates across kotlin-spring, kotlin-client,
kotlin-server, kotlin-misk, kotlin-wiremock to apply lambdas at
point-of-use instead of relying on pre-escaped values
- Fix $ in PATH const vals, special chars in annotation strings,
and */ corruption in string literal defaults
# Conflicts: # modules/openapi-generator/src/test/java/org/openapitools/codegen/kotlin/spring/KotlinSpringServerCodegenTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR checklist
Commit all changed files.
This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master.
These must match the expectations made by your contribution.
You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example
./bin/generate-samples.sh bin/configs/java*.IMPORTANT: Do NOT purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
master(upcoming7.x.0minor release - breaking changes with fallbacks),8.0.x(breaking changes without fallbacks)"fixes #123"present in the PR description)Summary by cubic
Fixes Kotlin string escaping across generators and hardens Markdown rendering to prevent broken docs. Prevents interpolation and compile errors for $, backslashes, quotes, newlines, triple‑quoted strings, and comment‑close sequences in paths, annotations, docs, and defaults.
unescapedSummary,unescapedNotes,unescapedMessage,unescapedDescription,unescapedDefaultValue(ops, params, properties, responses).lambda.*:escapeInNormalString,escapeDollarInMultiline,escapeDollar,removeLineBreak; addlambda.escapeMarkdowninDefaultCodegen; remove old per‑generator lambdas inKotlinSpringServerCodegen.kotlin-spring,kotlin-client,kotlin-server,kotlin-misk,kotlin-wiremock(Retrofit2/@get and @Query/@Path/@Header, OkHttp, Volley, Ktor2, Vertx, JAX-RS, Javalin 5/6, Multiplatform, Spring RestClient/WebClient).@JsonPropertynames andPATHconst vals now escape$.unescapedDefaultValuewithescapeInNormalStringin params and model properties; keep enums and numbers unchanged.unescapedSummary/unescapedNotesandunescapedDescriptionin docs and OpenAPI annotations; escape multiline descriptions withescapeDollarInMultiline; escape Markdown in API/class docs withlambda.escapeMarkdownto avoid premature code block termination.$in path/query and defaults; tests assert@JsonPropertyandPATHconst string escaping; updatekotlin-miskconfigs to usepetstore-kotlin-misk.yaml; regenerate samples and docs.Written for commit 779bcab. Summary will update on new commits. Review in cubic